From 0ade02ba3a74f4e5461d471c3e0fbcde4a00119e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 16 Apr 2015 19:23:27 +0100 Subject: [PATCH] libxl: fd events: Break out fd_occurs No functional change, only code motion. Currently, contrary to this function's name, there are two sites where efd->func() is called so one of them doesn't go through here just yet. That will be dealt with in the next commit. Signed-off-by: Ian Jackson CC: Jim Fehlig CC: Konrad Rzeszutek Wilk Tested-by: Jim Fehlig Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3efb357472..2b2254eff6 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1121,6 +1121,14 @@ static int afterpoll_check_fd(libxl__poller *poller, return revents; } +static void fd_occurs(libxl__egc *egc, libxl__ev_fd *efd, short revents) +{ + DBG("ev_fd=%p occurs fd=%d events=%x revents=%x", + efd, efd->fd, efd->events, revents); + + efd->func(egc, efd, efd->fd, efd->events, revents); +} + static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, int nfds, const struct pollfd *fds, struct timeval now) @@ -1183,10 +1191,7 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, break; found_fd_event: - DBG("ev_fd=%p occurs fd=%d events=%x revents=%x", - efd, efd->fd, efd->events, revents); - - efd->func(egc, efd, efd->fd, efd->events, revents); + fd_occurs(egc, efd, revents); } if (afterpoll_check_fd(poller,fds,nfds, poller->wakeup_pipe[0],POLLIN)) { -- 2.30.2